Skip to content

[Backport 3.6] Fix flaky org.opensearch.knn.index.codec.jvector.KNNJVectorTests.testJVectorKnnIndex_mergeEnabled (2nd attempt) - #363

Merged
reta merged 1 commit into
3.6from
backport/backport-362-to-3.6
Apr 6, 2026
Merged

[Backport 3.6] Fix flaky org.opensearch.knn.index.codec.jvector.KNNJVectorTests.testJVectorKnnIndex_mergeEnabled (2nd attempt)#363
reta merged 1 commit into
3.6from
backport/backport-362-to-3.6

Conversation

@opensearch-trigger-bot

Copy link
Copy Markdown
Contributor

Backport 4035056 from #362

…JVectorKnnIndex_mergeEnabled (2nd attempt) (#362)

* Fix flaky org.opensearch.knn.index.codec.jvector.KNNJVectorTests.testJVectorKnnIndex_mergeEnabled (2nd attempt)

Signed-off-by: Andriy Redko <drreta@gmail.com>

* Reduce number of documents to 10

Signed-off-by: Andriy Redko <drreta@gmail.com>

* Address code review comments

Signed-off-by: Andriy Redko <drreta@gmail.com>

* Address code review comments

Signed-off-by: Andriy Redko <drreta@gmail.com>

---------

Signed-off-by: Andriy Redko <drreta@gmail.com>
(cherry picked from commit 4035056)
@reta
reta merged commit 4ab1063 into 3.6 Apr 6, 2026
33 of 47 checks passed
@opensearch-trigger-bot

Copy link
Copy Markdown
Contributor Author

The backport to 3.5 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.5 3.5
# Navigate to the new working tree
cd .worktrees/backport-3.5
# Create a new branch
git switch --create backport/backport-363-to-3.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4ab1063863b5622e1489cd16cdbd31cf7c1e7ea8
# Push it to GitHub
git push --set-upstream origin backport/backport-363-to-3.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.5

Then, create a pull request where the base branch is 3.5 and the compare/head branch is backport/backport-363-to-3.5.

reta added a commit to reta/opensearch-jvector that referenced this pull request Apr 7, 2026
…JVectorKnnIndex_mergeEnabled (2nd attempt) (opensearch-project#362) (opensearch-project#363)

* Fix flaky org.opensearch.knn.index.codec.jvector.KNNJVectorTests.testJVectorKnnIndex_mergeEnabled (2nd attempt)

* Reduce number of documents to 10

* Address code review comments

* Address code review comments

---------

(cherry picked from commit 4035056)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
(cherry picked from commit 4ab1063)
reta added a commit that referenced this pull request Apr 7, 2026
…JVectorKnnIndex_mergeEnabled (2nd attempt) (#362) (#363) (#365)

* Fix flaky org.opensearch.knn.index.codec.jvector.KNNJVectorTests.testJVectorKnnIndex_mergeEnabled (2nd attempt)

* Reduce number of documents to 10

* Address code review comments

* Address code review comments

---------

(cherry picked from commit 4035056)



(cherry picked from commit 4ab1063)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant